From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 17 Jul 2011 01:34:49 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~845^2~144
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=8d576a545d08182fae5c7d705a53da2a84e0d85a;p=emacs.git

Merge from trunk.
---

8d576a545d08182fae5c7d705a53da2a84e0d85a